Remove stale cvs conflict marker.

diff --git a/ChangeLog b/ChangeLog
index 0a0f26400ef52253474fa025c465f754cc4170fe..6b8fff34ef69ce3157236195a3c9f455b4e434f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -80,7 +80,6 @@
        for replacing the selection via DND or copy-and-paste.
        (#64998, Damon Chaplin, Sven Herzberg)
 
->>>>>>> 1.8517
 2006-12-23  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkimmulticontext.c: Be careful to not override